From: Kenichi Handa <handa@etlken>
Date: Fri, 14 May 2010 07:29:06 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~4807
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c2eb4a8321dd86f085724c709e881663c81d0c6b;p=emacs.git

merge trunk
---

c2eb4a8321dd86f085724c709e881663c81d0c6b